Refactorization of handy