Better code
Travis configuration