Cleanup #115. Closes #114