Reformat class __construct input