Cleanup
Cleanup and grunt, css