Code tidyup.