Starting to clean things up.