comment cleanups for Handler