Code clean-up to add clarity to a few areas.