Cleanup initialization. Closes #18. Closes #20.