better comments, cleanup