[F] Refactoring