Some refactor + little performance improvements