code cleanup: moved all properties from .m to .h