Clarity fixes #32