Mess refactoring start