Remove catch that is no longer necessary, reformat code to use immibis'
tabs instead of my spaces.