LOCSERVICES-4138 improved readability of code