Remove hex dump, fixed switched if statements