Clean up code further with struct helper