Improved grunt setup, minor style changes