Small cleanup all over the code base

Seems to be Friday...