Ref: Improve formatting