Readablitlity

I have too much time on my hands.
Merge branch 'master' of https://github.com/julianweisbord/fhsapp_v2