Cleanup/3.x/client further cleanup

Lot of minor client cleanup:

- renaming of live to alive
- lots of javadoc issues
- some minor style issues.