just a few minor cleanup things