Refactor so one constructor calls other