minor cleanup
merge refactor-tractor