Improved Sass structure