refactoring removed initial solution