Whitespace fixes
Miscellaneous little optimisations

- Prefer iter over into_iter where appropriate
- Cut down on cloning