Fix some formatting issues
Final fixes in formatting checker