code clean-up (probably, first-in-a series)