Comment & Refactor