Refactor embedded focusing