Nisto Mostly performance improvements and refactoring