Refactoring and cleaning of existing solution