Some formatting issues fixed