small cleanup and refactoring/renaming