Clean up. closes #61