cleanup constructor param code