refactor class anme