Refactored and removed stale comments