cleaning the code a little
cleaning the code a little