* Minor clean-up