Issue #32 - Clean up