App update, refactoring.