replace unnecessary uses of select{}
idiomize imports
Merge pull request #1 from dominikh/idiomatic

Some code adjustments to make code more idiomatic