implemented code review again tg-4020
implemented code review again tg-4020

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