Removed error handling.
Added block to if expression.
Added block to if expression.
Changed map to forEach.