Cleaned up to match jshint