CSS cleanup, organization