Fixed source code layout according to  Go's way