GENERAL

• Code refactoring to fix uninitialized struct values