Re-org and make SCSS more readable