Move instance variable definitions into .m file