Reformatted some methods