Scripts/ToC: Few codestyle changes and clean ups