Moved private ivars from .h to .m.