Small update.
Comment and namespace updates.