Refactoring. Nothing weired.