[DF-2507] Small refactoring
[DF-2507] Fixed Reloading of skybox