Refactoring and one parameter removal