updated
renamed
cleaning up code