convert to 'new style' classes and refactor