Format Fixing
More format fixes