Most spacing is now consistent.