OPAL-2190: Code improvements following comments