Slight code organization change.