Split into more files
Run go fmt around