Some refactor on duplicated classes