Formatting fixes, code cleanup
Formatting fixes, code cleanup
Merge pull request #361 from ronkyo/tmpsf_dev

TMPSF CISWMI-152