Whitespace and tweaks to appease jshint