Refactor demo to make it a little easier to modify