code Refactoring & AI edit

so so