Node implemenation looked cleaner