[f1]Code refactoring