improve and simplify scripts for consistency
19 files changed