Cleaned up some more matrix expressions