simple refactoring and important note in doc comment