Minor:

- cleanup and convert
Why add tables to the positions?