Task refactoring with embedded TaskStep JSON