Some code tidey-up.