cleaning up code
cleaning up doc