Minimal updating of scripts

Improve readability and such

Change-Id: Ide26a0aeacc30be70a8369df64b9203bf9ee49df