improve and simplify scripts for consistency
22 files changed