Clean: minor code fixups with no functional change - Hidden a couple statics inside a class to avoid accidental access - Moved a TODO comment where it should really be. - Added warning about thread safety