Cleanup with golint