Updated script
Don't align structs
Uncrustify pass