cleaning up patch layout