Remove some duplication &nd an inaccessible feature