Refactor all these ivar struct commands