Refactored example again (a little).