Minor refactoring and comment changes