Small refactorings and progress on ducking