Refactored names and optimized scanning of nodes
Merge branch 'Better-scanning'