refactor app: corrections