Optimization and clean-up.
Special changed.