refactored some comments...