FE: Code refactoring ...