- coding style cleanup
- various fixes