comments and error renaming to make golint happy