More clean up / optimizations
Uncrustify