Made golint a slightly happier