Minor refactoring
Struct ordering refactored