make app
soft refactoring