HCI refactoring