cleaning up and rebasing to current rust tip
cleaning up a bit more