refactoring to be more scala-style
refactoring to be more scala-style

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