minor clean-ups / constifications