changed things around
cleaning things up