features: code format, fix usings.  cleanup: a few more renames