Refactored and tightened comments