Began refactoring ProfileManager
Cleaned up ProfileManager
Finished refactoring