Initial changes to run golint and govet