Code clean-up of some sort.