Renaming and commenting for clarity