Refactor edit subscription