Simplify construction