clean up and add javadocs

Change-Id: I7f628106247de887cd91c4a4b4b55d3ebfa700c8
33 files changed