minor edit & cleanup