More cleanups. Closes #116