Refactor Galeev