More refactoring, adjusting comments.