Improved and cleaned Node