Small fix
Refactoring
Use 'hmatrix'