Some code-cleanup + javadoc completions