Fixes #20
Clean-up from #20