Removed some formating quirks