Develop

- DRY via Lib class
- cleanup and minor adjusments/fixes
- CS
- 100% BC - no test has been modified.

Feel free to use it.
Otherwise you may disregard.