Formatting fixes for Travis build tests