Various cleanup changes
Resolving some minor javadoc complaints