Fixed remaining problems with jshint complience #322