Fix regressions introduced by the refactoring
Code cleanup
Reduce nlcc model charge