Simplify the constructor