* Little refactorization of code