big cleanup
rework