Cleanup and added monitor params to launch file