Tidying GE classes