Elements-data

Missed inline documentation and cleanup.