Metadata for pieces
Cleaner code + metadata
typo