Revise for golint