Misc cleanups

@fosdev Please review and merge!
This is optional so I would not force it to be there.