Hotfix to remove double loading and flickering + minor comments removal