Cleaning up code, larger map