Refactored  methods