Refactor / Cleanup example