refactor arg orders in Launch
code cleanup / refactor