solve indent problem and fix the format