Format returned record better