Minor clean up for code review