Some clean-up.
More clean-up

Closes #5