minimally clean styles
complete merge