some cleanup based on PR feedback