Cleaning up rules and using @extend