[REFACTOR] @0.1 refs #35787 Cleaned the code