Unfunctional change to classloader, refactor and comments