[TASK] Refactor app file