BBC - cleaned up comments