cleaning up structure, automating size detection for li and moves