small cleanup and give credit for merge