Reformatted to match rules