house cleaning, minor subtopic changes