Cleaned up Node a bit