more minor code cleanup
fixed up rustours