Minor code/ comment refactoring