Cleaned up Node Class