Tidy up data component attrs