Whitespace and indentation edits
Rename @area instance variable
Merge pull request #1 from Dgrady3/hh-refactor

Hh refactor