Refactoring, comments.