add data file and clean up

-remove itinerator
-make method static and extract constants