removed more unnecessary divider logic