Update classes that didn't benefit OO.
Change javadoc in files