Refactor with More Methods for DRY Code