cleaning up a bit
cleaning some more