FE: Code refactoring
FE: Code refactoring