Cleanup & extend
jshint fixes