Reformatting to fit golang standards