Changes from code review, thanks! Also, fix lint issues.