Improve example a bit more