Just a clean up
Closes #1
Closes #10.