Add results from Cyp's code review