Trying to make the CSS easier to read (again)