minor reorganization to keep things a lil more smacss-y