Merge "Tidy up Package and classloader comments"