Reformat to fit golang standards