Reformat and require fix