tweak formatting and remove all tab marks from both scripts