change data notation to colon

The proper notation for itemid and data is id:data.

Also, my editor removes all extra white-space from the end of lines.