More override/private cleanup