Removed extra struct access