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

Minor clean up of the .h file.

I haven't changed method names, so it shouldn't break anything.