[INTRM] Running Version to be cleaned.
[INTRM] Reference for clean up
[TASK] Clean code using uncrustify
[TASK] Further CLean up