Refactor some signals