Refactor into Object