Moving the classes (complexNumber, matrix) into separated files. Writing better unit tests, especially for the Matrix class... Cleaning out main(). Finishing code 'templatisation', specifically ...