Cleaning up params struct
refactored neighbor grid