Minor refactoring (comments)