minor_cleanup