Add more logic to clean_body! to clean up edge cases.