Simplify constructor a bit