tiny refactorings and comment fixes