Finishing tasks refactory