clean up code, change to SASS