clean up
wip: script to class object optimized