MAJOR code clarity improvement from cleaning up selects with #define'd struct indexing