clean up patch structure

clean up patch structure