cleaned up code
worked more on ticket class