Reformatted code to use standards of code