more cleanup for oop