Applied changes after code review

@robyoung
@pbadenski