whitespace, jshint fixes, other cleanup for more consistency