re-formatted using the new formatter