fix(validate data id) Fixes data with same id being added to the Collection
style(formatting) trailing white space issues