Swachh Bharat campaign to focus on comprehensive sanitation, waste management