Result of code review by Rahul.