Refactor/update example