Clean and debug (#4)