some cleanup, giving things more room to breathe