updates types to be scala like