map working cleaning up code.