remove redundant code / reorganize CSS