switch to oo code style