Minor clean-up