Some arrangements and optimizations.