Improve & simplify constructors