better comments, streamlined....