Moved non-ANSII stripping + Code cleanups.