trying to increase readability re: issue #15