Improve a couple patterns