Clean up
Clean up
Changes to prepare for issue #57