New decomposition code
Cleanup matlab output