cleaned up the code a little bit
cleaning things up more