- basic function clean up