cleaned up loading of assets