[DF-598] review refactor (ios, mac os)