Cleaned up the scss structure