comment updates
updates (refactoring)