Refactoring
gofmt