cleaned up code as I am finishing

moo