vallahi finished refactoring