tweak changes per code review
tweak changes per code review

- keep obsolete methods next to their replacement;
- use var instead of explicit type;
- use LINQ methods over query syntax;
- remove unneeded optimization.

pardeike/Harmony