Refactor example code :)