Fixed grunt style issues; grunt check does not pass yet.