Messy interaction improvement.
Refactoring.