Minor update/clean-up