add format and fix