one more quick code clean-up re: #71