Cleaned up the launcher syntax