* language level fixes
* dead code dropped
* one-time use variables inlined
* control flow simplifications
* changes code review
* unnecessary parenthesises dropped
* fixed CS