Smaller improvements for better understanding.