format cleanup
Added changes from @kevmoo

Reverted some blank lines - i like blank lines, sorry :)
Merge branch 'kevmoo-master'