Code Cleanup, New JSoup