cleaning up code & adding full neighborhood