Reformatted to new rules