refactoring, removing lines