Reduce complexity
Fix comment