Cleaning, micro-optimizations.