Minor flow and formatting fixes.