MAT 1341A - Minor fixes and removal of redundancies