Fix modifier order, update stream toList calls, fix some magic numbers

  • Fix modifier order, update stream toList calls, fix some magic numbers

Merge request reports

Loading