improve readability refs #44