cleanup
re-design the list class
adding safe list class & cleanup