Fix spacing & remoce unused exception references