Cleaned up Career class