Refactoring towards standard Go formatting