[WIP] Clean up jshint warnings