clean up according to @mikera notes