Refactor matrix call set/get
Modified matrix type