TRIVIAL: Renamed fields
Refactored using lets to eliminate duplication