go fmt
more refactoring