minor cleanup things