cleand up code
cleaning up stuff