Additional refactoring of block syntax with #map