Reformat for consistency
Get tests passing