Requested formatting fixes