Some jshint suggestions
Smaller steps so more responsive