Various formatting issues fixed.