Cleanup
Renaming
Fix in cleanup
Cleanup and neighbours function added.
Neighbours integration