refactored some method names