code clean and grunt task improvements