Fixed comments from code review on 28/7/2013