dependency changes
cleaning up code