fix: issue #60, some reformatting