CROSSDATA-177, CROSSDATA-172,CROSSDATA-173, resolving warnings scala style.