RestCallBuilder code cleaned