code simplification
code simplification

SimonBaumannPro/legorange3.0,webcom-components/legorange,SimonBaumannPro/legorange3.0,SimonBaumannPro/legorange3.0,webcom-components/legorange,webcom-components/legorange