Made the project service DRYer