Comment & cleanup