minor cleanup, renaming