Refactored some examples