Fix spacing & remove unused exception references