refactored tg-3050
refactored tg-3050

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