Additional comments, cleanup