Cleanup, rename, bug fix.