Added refactoring helper class to add comments.