Refactored. Improved method naming