Remove magic by creating plural functions