Small improvement on clear

 * Refactorization
 * Translation
 * Pass only needed arguments