clean up & sass implement