cleanup
updated call preprocessing