code optimization & rename partials