Format and fixes