+ Didn't find a great way to make the cleanup generic, a just copy/paste pretty much for now + fmt + clippy