cleanup
rework example