* Removes use of most global variables * Adds some some logging * Removes unused close() method for Xss