Removed more formating quirks