refactored method names from the project