ZP-1389 Fix formatting, and break for loop to increase performance. Released under the Affero GNU General Public License (AGPL) version 3.