Cleanup patterns
Make things prettier