Some formatting amended