Bit of consistency improvements / cleanup for you Bean
Merge pull request #2 from mkpeacock/master

Cleanup and improvements for consistency.