refactored some methods