Run.once for optimization && indentation fix