More formatting issues fixed