cleaned up conditional in requrie move