less lines
refactoring