cleanup and better organize CSS