Cleaning code and improving launch