Moved private ivars from .h to .mm.  Removed unnecessary import.