Crank cleanup per PR feedback