Cleanup and add collision checks