Cleaned out the code and aligned to the new strictness levels in ntentan