clean up [Closes #8]