minor cleanup
some changes, but nothing useful