Cleaned up for jshint