cleaningup
cleaning up #2