Fixed package imports, go fmt