A couple of minor refactorings and comment changes
4 files changed