small refactoring and commenting