Commentary refactor