Simplify class hierarchy.
1 file changed