Renamed for clarity
Minor code cleanup