Cleanup, fixed the list crashing