re-arranging/cleaning up sass