Merge "Cleaned up MsoLogger class"