refactoring, removed comments