Refactoring so we can add more usage examples