minor cleanup

Greetings, nothing new here, just a few improvements as I was browsing the code.

Expect some real work :soon: .