comments, slight cleanup