Indentation fix, Structure fields order fix