slight cleanup of pr #48