Simple fix and cleanup which also closes #90