More refactorization..