Removing uneeded each since map convers this + fix style issue