[skip CI] Refactoring + Fixedcode style.