Simplify wrapper scripts