cleanup comments
refactoring