Clippy fixes; Don't pass some things by value and match => if let

Closes #10
2 jobs for refactor in 5 minutes and 14 seconds (queued for 4 minutes and 26 seconds)