Cleanup for #49
Cleanup for #49