scss refactoring and clean up