Did some cleaning based on Dale's comments.