Code cleanup and travis new matrix.