formatting cleanup
better filtering of args for pre/post scripts