Moving things around to make jshint happy