Clean code
Fixes #197
Quick reshape
Removed dead code
Only run more if we have the problematic Octave case. Fixes #199