refactor wind