More cleanup after SMACSS