minor refactoring
refactored comments a bit