andritogv A bit of cleanup