stewardship code cleanup and comments