Ongoing code cleanup