Fixes #23 - More cleanup