go fmt, refactor struct