Reformatted code for cleanliness