enhance(logic): better piece structure