Cleaning (close #10)