code cleanup, write javadocs
11 files changed