Refactoring some objects