Make examples better