Various simplifications and spelling fixes

Ben Wellsrequested to merge
bvwells/entitlements-gcp:simplify into master

Merge request reports