Reformatted code based upon current standards.