Cleanup spacing and use `in` to test for map instead of undefined comparison.