improved comments, cleanup