Refactoring
go fmt