DP5861 fix: code review remarks
DP5861 fix: code review remarks

Amsterdam/atlas,DatapuntAmsterdam/atlas,Amsterdam/atlas,DatapuntAmsterdam/atlas_prototype,Amsterdam/atlas,DatapuntAmsterdam/atlas,Amsterdam/atlas,DatapuntAmsterdam/atlas_prototype,DatapuntAmsterdam/atlas