Added jshint to grunt test task, cleaned up code style