refactored some method names appropriately