Issue #2: Cleaning-up