Moved private variables to .m files.