Cleaning up withdraw code