minor cleanup and mech memo