apply golint suggestions