DEV: Clean Matrix class