More code tidy ups.