Use correct patch format; cleanup