Some tidy ups.