misc cleanup based on PR feedback