minor cleanup in preparation for code review