cleanup with golint