FE: Refactoring ...