[Toolkit] More documentation and cleanup.