Code Vein 1 was awful so all those are good changes

Move as far away from this abomination as possible