cleaning up the code a bit
cleaning up the code a bit