cleaning up sass structure