Fix remaining lints from `clippy::pedantic`

Part of #7.

This MR has fixed the remaining lints from the clippy::pedantic category.

There are no interesting commits, just code being moved around.