slight code clean-up