Refactoring for Gleb