Minor adjustments, tweaks and optimizations.