[6806848468] Refactoring