Fix a few of Linda's suggestions
Merge branch 'master' of https://github.com/vladimir-v-diaz/pep-maximum-security-model