Memory refactoring
Cleaning up collision