Ticket 38 code review