Minor refactorization and a some more comments