Addresed comments from code review https://reviews.facebook.net/D27567