Minor refactoring
Comments