Simplify the scripts a bunch