Tweak formatting and remove unused stuff in Gruntfile