Small refactor of app model