Removed duplicate struct & fixed a warning