* More idiomatic changes
* Make * match if possible