#19 reformatting