Minor tidy ups