additional comments, cleanup