Cosmetics: Matrix class structure (no code changes)