Minor cleanup and refactoring
3 files changed