Simplify class construction