Refactor usage