I guess this causes more problems than it solves.
Merge into a single script
Revert whitespace stuff.