Reformat + Fix warnings reported by geppetto