Nonah Waldron is rounding into form