moved some properties to .m files