renamed code
cleaning up