JavaDoc introduced + imports clean up