FE :: Minor refactoring