Clean up a bit

Closes #13
Minor improvements