Clean up script a bit

Change-Id: I1e36b576543a8340b5a28ac3151e51fde08199ba