#11 - Reorganize constructors to preserve default style