Address various golint errors