Feature/clean up tuplegetter