clean app ( rename variables and refactor )