small cleanup/renaming