Fixes the Dymola specific removals again
Refactoring (only whites spaces and naming)