Make jshint happy: fix indentation and unused vars