project and style updates
Merge branch 'feature/refactoring' of https://github.com/local-projects/change-by-us-3 into feature/refactoring