Refactoring to suite the new ruby setup