refactor, more OO stability