delete unnecessary code / modify constructor