Whitespace / convience function changes, no functional changes
Merge branch 'master' of https://github.com/knagra/farnsworth