Little bit of a cleanup. Closes #5
0.3.1