recommended changes from golint