[DEV] rework some global elements (step 5)