Optimization & code clean