(#667) - minor cleanup