Scripts/Misc: Some code style fixes for old code