Reformatted code organization