fixed formatting issues in both patches