Cleanups to prevent jshint warnings