comments and cleaned up sass structure