Refactored for reuse/DRY of methods