Clean up from Issue #8