renaming/reorganization for clarity