Cleanup viewmodels

[Plouc314]

• Light clean up of the view models
• Normally reduced the complexity of InFlightViewModel below 50 but can not be sure as it is not indicated in sonar cloud

Close #410 Close #460

[sonarcloud[bot]]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
83.7% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud