Some clean up, add some property funcs like scheme_empty