- removed redundant call to map