Refactor basic usage