Code review and clean up
Merge branch 'master' of https://github.com/digitalabs/Fieldbook

# By chezka
# Via chezka
* 'master' of https://github.com/digitalabs/Fieldbook:
  GCP-5911, GCP-5912