Ending refactoring Object Class