refactoring liya.utils