TravEnt : More clean code