Added recommendations after 2013 code review.