Apply reformatting suggestions to merged PR

Rather than holding up the proposed change, PR-105 was merged. This
commit applies the suggested code-changes (all formatting/style)

Thanks again @orenmazor!