rockin the tour
cleaning up code a bit