Refactor demo