Minor refactorization..