Refactored struct creation to be less verbose