Cleanup and added launch file