Style changes
Minor fixes
Merge pull request #2 from WheresHJ/hj_edits

Style and formatting changes
fix style conflicts