add comment back -- oops
use `add_site_option` to prevent autoloading
simplify code and remove unnecessary steps