Rejigger how piece data is set up.

This is both more elegant and less code.