Cleanup
Ported to SASS