more renaming and commenting