Cleaned up the neighbors module.