Refactoring if operators
Merge branch 'feature/data_transfer_from_csv_77' into staging