Move definition of matlab and octave - methodnum q3
Remove trailing whitespace - calcu q6