Some major formatting fixes