Code refactoring. Nothing changes otherwise