Aniother refactoring