app refactor ok