More Refactoring to Objects