Change to OO style