code clean-up #1
(#420)