sass clean-up and modularizing
scss modularizing