Comments and minor refactorings #2043