Streamlined clause patterns
Changed switch patterns