Moving towards OO style