#18 and formatting