Add clear button
Refactor