misc: code cleanup

Cleaning the code + uncrustify.

-*S