Cleanup and Finalized Accordion swap code