cleaned up the code a bit - got rid of commented out