Tidying up & better catch blocks