Eliminated unnecessary call to map