Refactor to clean up source code
Merge branch 'feature/manage-approved-apps' into feature/revoke-app