Simplify and update the contructors.