Refactored code
Refactored code

rellermeyer/99tsp,rellermeyer/99tsp,rellermeyer/99tsp,rellermeyer/99tsp,rellermeyer/99tsp,rellermeyer/99tsp,rellermeyer/99tsp,rellermeyer/99tsp,rellermeyer/99tsp,rellermeyer/99tsp,rellermeyer/99tsp,rellermeyer/99tsp,rellermeyer/99tsp,rellermeyer/99tsp,rellermeyer/99tsp