Reformatted some of main