refactoring. comments.