Various ToolkitPCML minor refactors. Cleaned up temp vars, removed unneeded vars, cleaned up comments.