updated functions
cleaning code
cleaning code