Refactored some instance methods