Misc cleanup as suggested by @zeffii