A few cleanups to test patterns