Cleaned up patch output somewhat