CSS More clean up