Minor refactor and speed up Travis