Finished Refactoring MessageManager singleton