minor coding embellishment, added TODO