Doing some slight restructuring of scss