Refactor signals