Fixed my mistakes