Refactoring of naming and method size